87b3b7f3f371b18676723e8a19c3cdf7e18e20fa,estatioapp/module/lease/dom/src/main/java/org/estatio/dom/lease/invoicing/InvoiceCalculationService.java,InvoiceCalculationService,calculateTerm,#LeaseTerm#List#LocalDate#,254

Before Change


                final BigDecimal annualFactor = leaseTerm.getLeaseItem().getInvoicingFrequency().annualMultiplier();
                final LocalDate epochDate = ObjectUtils.firstNonNull(leaseTerm.getLeaseItem().getEpochDate(), systemEpochDate());
                BigDecimal mockValue = BigDecimal.ZERO;
                if (epochDate != null && invoicingInterval.dueDate().isBefore(epochDate) && leaseTerm.getLeaseItem().getType()!= LeaseItemType.DEPOSIT) {
                    mockValue = leaseTerm.valueForDate(epochDate);
                }
                final CalculationResult calculationResult = new CalculationResult(

After Change


        final List<CalculationResult> results2 = Lists.newArrayList();
        for (final InvoicingInterval invoicingInterval : intervals) {
                final LocalDate epochDate = ObjectUtils.firstNonNull(leaseTerm.getLeaseItem().getEpochDate(), systemEpochDate());
            if (!invoicingInterval.dueDate().isBefore(epochDate)) {
                final LocalDateInterval effectiveInterval = invoicingInterval.asLocalDateInterval().overlap(leaseTerm.getEffectiveInterval());
                if (effectiveInterval == null) {
                    results2.add(new CalculationResult(invoicingInterval));